Merge branch 'master' into test-protocols * master: uninstall: "make uninstall" before "make install" works tests: fix tests on aclocal search path precedences