merge trunk to hibernate4