Fixed #133:  Fix needed because of behaviour differences between EclipseLink and Hibernate.
Merge remote-tracking branch 'upstream/master'