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