Hibernate no mola tanto.
Merge origin/master