Merge branch 'pootle-import' into experimental