Trunk Release 20201007-18

Pre-release

github-actions released this 07 Oct 17:16

3531826

Merge branch 'master' into develop

Choose ours version for all conflicts. I hope this was right because since #161 was 7 weeks older than #300.

Assets 3

Provide feedback