Happy new year 2016

Merged with default protocol5

Backport string changes from protocol5

Merged with default protocol5

(0) -100 -30 -10 -4 +4 +10 +30 tip

mercurial