rev
Merge branch 'master' of github.com:restefano/glossy
rev