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