Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle