Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle