Merge trunk into 1.1 branch