Update to hg 3243:9838aecd6340