Merge branch 'master' of https://github.com/h5p/h5p-wordpress-plugin