codePro fixes
static
Merge branch 's-gamma' into m-gamma
undoing static
Moving to or from a choke point now throws a StrategyException, rather than a StrategyRuntimeException