BRANCH 4.1: Fix for "This table [annotation] does not exist for database [sthpw]" on Admin site.
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1