Issue #85: removing situation from summary
Merge branch '3.1.x'