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