GradBogova_1-2-7_BETA1-1
Merge remote-tracking branch 'origin/master'