Merge branch 'master' of github.com:craftercms/studio3
Fix errors on Test, fix typo
Merge remote-tracking branch 'cortiz/master'