Prevent registration race condition
Merge branch 'master' of github.com:calzoneman/sync