Translation tweak based on feedback
Better error reporting in import XML
Merge branch 'master' into release-1.3.0