Issue #1355066 by devuo: Fix characters & from being output as & if they come pre-encoded as & from substituion.
