Documentation fix
Support for both ways of defining API exceptions
Version bump
Merge branch 'release/1.11' into develop