[mr] pull from Pootle (master)