2015-07-06 - releng
20:55	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/223172/ for testing	[releng]