Fix bug with segment all websites and cron
Merge remote-tracking branch 'origin/1.X' into 1.X