2015-08-04 - releng
17:48	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/226991/	[releng]