2014-11-19 - releng
21:19	<anomie>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/173336/3 to Beta	[releng]