roll back to af98a1f36442a4c3860f4cb7c5e4ecec900f997e
Merge branch 'master' of github.com:graysky2/profile-sync-daemon