fix 3660 (probably)
UnitDrawer: cleanup code paths
-
Merge branch 'develop' of github.com:spring/spring into develop