merge upstream commit v1.2.2

add language selection cookie - fixes #352

add another stupid magic command to gradle file because things stop working by default

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

mercurial