2015-05-08 - releng
20:05	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/209801	[releng]