15.05
Merge branch 'github.com_alexey/master'