Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile