merge upstream commit v1.2.2

add language selection cookie - fixes #352

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

mercurial