Merge pull request #2169 from ipavlikevich/master