Merge branch 'master' into 930-netbsd-connections-segfault