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