Merge branch 'iv-1.1' of github.com:h5p/h5p-interactive-video into iv-1.1
Merge branch 'master' of github.com:h5p/h5p-interactive-video
Merge branch 'iv-1.1'