Tentative inconsistent branch
Update error message
Merge branch 'master' into pierre
Catch inconsistency on bindings
Add a test for inconsistent warning (imperfect)
pinconsistency: marked as "unfinished business"
Merge branch 'master' into pierre