Merge pull request #1494 from ejurgensen/master