Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle