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