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