bug 1301: Fix issue with missing default for the encoding
Merge remote-tracking branch 'origin/bug-1301' into release