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