правка
Merge branch 'master'
правка
Merge branch 'alexey'
Merge branch 'github.com_alexey/master'