merged trunk into 4.2 branch