Merge branch 'master' of github.com:Michieljoris/greenglass into using_showhide
Merge branch 'using_showhide' of github.com:Michieljoris/greenglass into using_showhide