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