Merge branch 'master' of git://git.hcoop.net/git/crawshaw/fleet