Merge branch 'MDL-63690-master-integration' of git://github.com/mihailges/moodle