Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle