Merge branch 'api-1.1' into api-1.2
Merge branch 'api-1.2'
Merge branch 'master' of github.com:h5p/h5p-editor-course-presentation