Pull in all the commits from adamcoward during update of tool