Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2