Sync upstream and adjust Richards bug fix.
5 files changed