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