Merge branch 'MDL-65056-master' of git://github.com/abias/moodle