Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle