Merge remote branch 'pootle/master'