master #42

Merged
andrey merged 2 commits from master into release 2020-10-19 15:36:01 +03:00