Merge with upstream
Merge branch 'master' into erlang-process-mailbox