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