Fix #337
Merge branch '3.0' of github.com:calzoneman/sync into 3.0