Merge pull request #3349 from rpv-tomsk/master