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