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