Merge pull request #1797 from alan-baker/update-tools

Update tools