Restored part of file
Merge pull request #1515 from Semigradsky/master

Restored part of file
Merge remote-tracking branch 'upstream/master'