- Merged Trunk changes for 1.1 into branch

9 files changed