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