fixing preview mode bug. will go out in next release...
Merge branch 'master' into sync-queue