Merge 2.8.3

Bring the Rollbar version of moment up to date by manually reconciling the merge conflicts since 2.0.4.