Changes for 2.6.32