Merge the iwtransclusion branch back into trunk