fix #1790 by using base64 encoding
Merge remote-tracking branch '42wim/fix-1790' into fix-1790