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