Fixed board update to work when both pieces in a battle are destroyed
Merge branch 's-gamma' into m-gamma
fixed another test failing due to choke points