2015-01-14 - releng
14:56	<anomie>	Cherry-pick https://gerrit.wikimedia.org/r/#/c/173336/11/ to Beta Labs	[releng]