Latest Changes from Mercurial Branch.w