Upgrade bleach 840973

I had to move around things in the template for wiki images to workaround the bleach/html5lib bug.

r?