2015-07-07 - releng
19:58	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/223391/	[releng]