Merge branch 'MDL-63959-master' of git://github.com/tobiasreischmann/moodle