2015-07-11 - releng
03:54	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/224219/	[releng]