Merge branch 'jc/1.7.0-send-email-no-thread-default'