Merge branch 'bugfix/base64-encoder' into 'master'

Ansgar Burchardtrequested to merge
cherry-pick-689caf34 into releases/2.6

fix base64 encoder

See merge request !295 (merged)

(cherry picked from commit 689caf34)

6c9b134f fix base64 encoder

Merge request reports