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