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