Merge branch 'master' of https://github.com/Southpaw-TACTIC/TACTIC
Merge branch 'master' into 4.2