fixes bug 969042 - Correctly encode all ampersands, r=rhelmer