2017-07-27 - git
16:49	<paladox>	cherrypicking https://gerrit.wikimedia.org/r/#/c/368196/ to see if it has side affects	[git]