Merge remote-tracking branch 'pootle/master' into QA_3_5