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