2015-07-07 - releng
15:45	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/223301/	[releng]