Merge remote-tracking branch 'svn/trunk' into git_master

This commit is contained in:
Diederick C. Niehorster 2018-03-26 22:33:49 +02:00
commit 79c2f10235
16 changed files with 218 additions and 218 deletions