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