Latest core.
Merge branch 'user-results' into whitelist

Conflicts:
	h5p-php-library