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