Merge branch 'release'

diff --combined test/notmuch-test
index 6c65ed7a282bed731cc5bd4bbf0ce5196ee84dbd,5aced5cef9fdb98cd1c213486de1e0f008371c90..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570
--- 1/test/notmuch-test
--- 2/test/notmuch-test
+++ b/test/notmuch-test
@@@ -18,6 -18,7 +18,7 @@@ cd $(dirname "$0"
  
  TESTS="
    basic
+   help-test
    new
    count
    search
@@@ -60,13 -61,10 +61,13 @@@ els
      TEST_TIMEOUT_CMD=""
  fi
  
 +trap 'e=$?; kill $!; exit $e' HUP INT TERM
  # Run the tests
  for test in $TESTS; do
 -    $TEST_TIMEOUT_CMD ./$test "$@"
 +    $TEST_TIMEOUT_CMD ./$test "$@" &
 +    wait $!
  done
 +trap - HUP INT TERM
  
  # Report results
  ./aggregate-results.sh test-results/*