Merge remote-tracking branch 'pootle/master'