Fixes related to issue #355
Fixes related to issue #350
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk