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