Merge branch 'MDL-67383-master-1' of git://github.com/mihailges/moodle