Merge remote-tracking branch 'dstftw/generic-webpage-unescape'