- Merged trunk into 1.1 branch

51 files changed