Merge branch 'master' into mariano-editor-support