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