Merge hibernate:master into Stpehen001:master