Merge pull request #1452 from mkresin/master