master #49

Merged
andrey merged 3 commits from master into release 2020-11-12 16:21:25 +03:00