Merge branch 'master' of github.com:h5p/h5p-course-presentation
Merge branch 'api-1.1' of github.com:h5p/h5p-course-presentation into api-1.1
Added back -16 to avoid content distortion on existing content.
Merge branch 'master' into api-1.1
Merge branch 'api-1.1' into api-1.2