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

Conflicts:
	h5p-php-library
Fixes wrong and duplicate indexes. Fixes usage of correct charset.
Merge branch 'user-results' into whitelist
Merge branch 'whitelist' into settings