steve: distinguish between static equilibrium and regular equilibrium
Merge remote-tracking branch 'origin/master'