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