Fix race conditions
Merge branch 'master' of github.com:gdeglin/rpush