Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle