New Upstream Snapshot - khtml

No successful merges for khtml