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