исправлен баг http://jira.aplana.com/browse/APLANATS-702
Merge remote-tracking branch 'origin/master'