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