Patch for CRAFTER-1281 and CRAFTER-1295
Merge branch 'master' of github.com:craftercms/studio