Merge branch 'master' of git.triptico.com:git/artemus