Merge pull request #925 from victor-pavlychko/master