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