Merge branch 'master' into researcher_stats
changing staging config back to original
using default staging settings
messing with staging config
Trying to replicate asset compilation errors
tweaking config
Tweaking config
trying to isolate the config variable causing issues
Testing config fix
Merge branch 'researcher_stats'