Make synchronization per DB
Merge pull request #610 from bhariharan/master

Make synchronization per DB
Merge branch 'master' into unstable
Merge pull request #611 from bhariharan/unstable

Merge branch 'master' into unstable