Fix potential NPEs in CombatMap.setTitle.  Unclear which NPE is actually occurring.
Merge branch 'RELEASE-2.0.1'