2017-08-01 - phabricator
11:51	<paladox>	cherry picking https://gerrit.wikimedia.org/r/#/c/369001/ to test for any errors.	[phabricator]