2016-08-02 - tools.lolrrit-wm
22:42	<paladox>	cherry picking 302617 onto lolrrit-wm	[tools.lolrrit-wm]