Merge branch 'master' of /users/git/public/csc-propaganda