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