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