Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle