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