2017-05-11 - releng
12:57	<godog>	cherry-pick https://gerrit.wikimedia.org/r/#/c/353282/	[releng]