Release 1.2
Merge branch 'master' into hibernate4