Merge branch 'bug-1291' into release
Merge branch 'bug-1276' into release
Merge branch 'bug-1292' into release
Merge branch 'bug-1298' into release
Merge branch 'bug-1297' into release
Merge branch 'bug-1293' into release
bug 1301: Fix issue with missing default for the encoding
Merge branch 'release' into testserver-stable
Merge branch 'bug-1301' into testserver-stable