2015-11-29 - releng
05:34	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/255916/ for testing	[releng]