Yet another half-tested rebase

Merge some fixes from wine-staging

Fix remaining test issues

Rebased, test failures fixed

Old pushed version

Rebased

Tagging an old version

Another update: Fix a rebase problem that broke World of Warcraft.

Another hacky rebase. Mostly untested.

Tag cs 0.8

Just rebased, without timestamp query support

Release 1.7.18