- Merged trunk changes 796:817 into the 0.12 branch
11 files changed