Undo URI encoding of image links as RFC3986 already requires them to be
encoded
Merge remote-tracking branch 'upstream/master'