Commit 1f45a713 authored by Steffen Müthing's avatar Steffen Müthing

Merge branch 'cherry-pick-689caf34' into 'releases/2.6'

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

See merge request !296
parents 0e809960 16e9e93e
Pipeline #10389 passed with stage
in 24 minutes and 59 seconds