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