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