handling merge with online mods :-)
Merge branch 'master' of github.com:aaaarg/wt2
Tried to (successfully) conflict with myself.
WIP