Initial merge patch (I still need to review the individual changes.)
HTML preview not available, since no preview renderer could handle it.Try downloading the file instead.