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