Fixes related to #261
Fixes related to #379
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk