Merge pull request #1567 from ejurgensen/master