(#1384) - Fix db.sync cancel function
Merge remote-tracking branch 'upstream/master'