Jamesc dev

Herb updated while I was about to do a pull request.  I rebased recommit and doing the pull request now.