Merge back to main trunk
37 files changed