2015-05-08 - releng
04:47	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/209680/	[releng]