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