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