2015-05-12 - releng
00:36	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/210253/	[releng]