Resubmit DrSync
Merge pull request #3257 from spywhere/master

Resubmit DrSync