Merge pull request #679 from ariard/2020-08-concurrent-watchtowers