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