Version 2.6 has landed in a couple of distributions, so do stable
release, with backports of a few post-2.6 fixes.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>