Fixes for #347
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk