Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle