#490,#561
#490
#561
Merge branch 'trunk' of https://github.com/impetus-opensource/Kundera into trunk