master #50

Merged
andrey merged 2 commits from master into release 2020-11-16 13:30:46 +03:00