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