Patch against tk8.5a4, includes tests and docs