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