Fixing issue with scheduling feeds.
Merge branch 'master' into search

* master:
  Fixing issue with scheduling feeds.