merged Editor branch into master