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