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