Merge branch 'MDL-40084-master' of https://github.com/phmemmel/moodle