Merge branch 'MDL-61950-master' of git://github.com/ryanwyllie/moodle