Merge branch 'jc/am'

* jc/am: am: --rebasing am: remove support for -d .dotest am: read from the right mailbox when started from a subdirectory