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