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