2016-09-12 - tools.lolrrit-wm
16:25	<paladox>	cherry picked https://gerrit.wikimedia.org/r/#/c/310027/	[tools.lolrrit-wm]