Moved from github/catamaran
Merge branch 'master' of github.com:scandilabs/scandilabs-framework