Merge pull request #1536 from mkresin/master