Merge branch 'beta' of github.com:rpruim/mosaic into beta
Merge branch 'beta' of github.com:rpruim/mosaic into beta