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