Merge pull request #2304 from BillSeurer/master