Merge Trunk for 1.1.0