Merge branch 'arnied-wait-socket'