Imported 1.2.0 changes from git.

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