merge branch into current, updating workdir
Merge pull request #1007 from ethomson/merge

merge!