Merge latest version #3

Merged
dtomlinson merged 18 commits from develop into master 2020-07-22 23:03:57 +00:00
Showing only changes of commit 6b061c558b - Show all commits