Merge pull request #237 from github/edburns/pr-1483-backsync

Merge pull request #237 from github/edburns/pr-1483-backsync #197