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