Fixed #42
Merge branch 'master' into sync-adapter
One more line to previous fix.
Merge branch 'master' into sync-adapter