Fix for #529
Fix for #526
fixed broken build
#530
Merge branch 'trunk' of https://github.com/impetus-opensource/Kundera into trunk
Revert "#530"

This reverts commit bb7ba593798f38203fbfeed716a179fff4c3d8ec.
in clause
Refactoring for Fix #385
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk
Merge remote-tracking branch 'upstream/trunk' into trunk