2015-03-27 - releng
22:41	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/200248/ and https://gerrit.wikimedia.org/r/#/c/199988/	[releng]