[am] pull from Pootle (master)