Merge alpha100 branch back to main trunk
27 files changed