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