Merge branch 'master'
10.2014
Merge branch 'alexey'