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