2017-06-28 - production
19:17	<twentyafterfour>	cherry-picked https://gerrit.wikimedia.org/r/#/c/361935/ to wmf.7 refs T168899 + T167536	[production]