BRANCH 4.1: test fork
Merge branch '4.1' of git://github.com/Southpaw-TACTIC/TACTIC into 4.1