2015-07-15 - releng
17:53	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/224829/	[releng]