Revert "Revert "Merging from staging.Merge branch 'master' of heroku.com:pop-up-archive-staging""

This reverts commit 6359520880415a197ddcdef6cc7c1996826219ad.