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