sync: pipeline2 with pipeline2-sync-42d7#858

Merged

Robbie1977 merged 2 commits intopipeline2from pipeline2-sync-42d7

Dec 22, 2020

Commits on Dec 18, 2020

Merge pull request #849 from VirtualFlyBrain/debug-sync-39f5
Robbie1977
authored

Commits on Dec 22, 2020

Merge pull request #853 from VirtualFlyBrain/debug
Robbie1977
authored