1.3 editor for 1.3 IV
Merge branch 'master' into bug-fix-and-more-functionality
Merge branch 'bug-fix-and-more-functionality'