Update from dev #16

Merged
altavir merged 18 commits from dev into master 2018-10-12 11:18:55 +03:00
No description provided.