Merge branch 'master' into test-protocols * master: tests: don't let a known Solaris make bug poison too many tests gitignore: more use of anchors