Merge trunk into 1.2 branch