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