revert drafts by user as part of flags as this would mess up caching.    Also adjust windows_live check
Merge branch 'master' into wip