Merge remote branch 'origin/qa' into release
Fixing date-span bug in feeds
Merge remote branch 'origin/release' into qa