Periodic merge upstream #5

Manually merged
djpbessems merged 13 commits from development into master 2019-12-30 12:18:50 +00:00
3 changed files with 29 additions and 14 deletions
Showing only changes of commit 160784c912 - Show all commits