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