2016-08-05 - releng
17:54	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/299825/3 for testing	[releng]