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