Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle