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