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