Merge pull request #2065 from sandsmark/master