2015-08-28 - releng
23:40	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/234699/	[releng]