Coerce None to empty string

Rebased against 2.4, replaces PR #1334.

Fix for #1330