utf8 encoding
Merge branch 'master' into taverna-2.5