2015-08-11 - releng
21:54	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/230922/ for testing	[releng]