Merge iwtransclusion branch into trunk