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