Merge pull request #2367 from BillSeurer/master