Merge branch 'master' of https://github.com/stephanini/Spacebrew-Collab

Conflicts: conflict resolved