Imported 1.2.1 bugfixes.

git-svn-id: https://plugins.svn.wordpress.org/h5p/trunk@1018721 b8457f37-d9ea-0310-8a92-e5e31aec5664