Fix for issue #595 and #444
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk