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