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