Merge branch 'MDL-64736-master-2' of git://github.com/andrewnicols/moodle