BRANCH 4.1: fixed unserializable error
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1