Hg: Merge branches from two test machines
Mercurial revision: c8f0e66cb89f192a51740da8a506cdb71a82516d