Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' into cleanup/dockerfile
add missing openssl dependency
Merge branch 'cleanup/dockerfile' into feature/run_in_subdirectory
Merge branch 'cleanup/dockerfile' into feature/run_in_subdirectory