improve handling of inconsistent plans
Authored by: thibautd 2014-02-04
Parent: [r27799]
Child: [r27801]