BRANCH 4.1:
  - updated upgrade_script for sthpw/message
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1