Merge pull request #1571 from ejurgensen/master