More progress towards new rewards (economy, etc.).
Merge remote-tracking branch 'origin/master'