Merge branch 'master' of ssh://notmuchmail.org/git/notmuch