Merge pull request #1846 from BillSeurer/master