Problems found and fixed while developing client code.
Merge pull request #261 from xi-project/oy-fixores

Problems found and fixed while developing client code.
Merge remote-tracking branch 'origin/master' into 0.12