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