2015-10-26 - releng
18:22	<MaxSem>	Cherrypicked https://gerrit.wikimedia.org/r/#/c/248374/ on beta	[releng]