Merge pull request #14 from nromanen/master

merge master->dmirty(10.1.14)
Merge pull request #15 from nromanen/edd

Merge pull request #13 from nromanen/master
Merge pull request #16 from nromanen/dmitry

Merge pull request #14 from nromanen/master
pre review ready
Merge pull request #17 from nromanen/dmitry

merge dmitry->master(10.1.14_2)
Merge branch 'master' into edd
after merge edd->master
after merge edd->master_2
Merge pull request #20 from nromanen/master

merge master->edd(10.1.14_2)