Merge branch 'master' of github.com:systemed/potlatch2