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