Merge branch 'staging'

Closes #3315.  Thanks Guillermo!