Added log re-sync warning.
Merge branch 'master' into premium