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