Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle