2015-11-29 - releng
23:23	<bd808>	updated cherry-pick of https://gerrit.wikimedia.org/r/#/c/255916/ to PS2	[releng]