Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle