Merge branch 'master' of gitolite-vserver:pyjson5