2016-11-18 - releng
15:42	<elukey>	cherry picked https://gerrit.wikimedia.org/r/#/c/322268 on puppet master	[releng]