Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	README.md
This commit is contained in:
Tomas Bures 2020-01-12 09:32:05 +01:00
commit 674399eb74