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