[am] pull from Pootle (master)
[ff] pull from Pootle (master)