Merge branch 'master' of datman:eighthpence/datman