Merge branch 'master' of palpatine:/srv/git/www