r442458 fixed a security issue, so it should be merged to the quarterly branch as well as head.
OK, sounds good. I didn't merge it because it includes an upgrade, but I will.
I submitted an MFH request for r438364,438419,438787,441093,442458 to 2017Q2.
This has been merged. Thanks!