spoiler toggle
Merge branch 'prod'
correctly get sf_user if not defined
Merge branch 'master' into prod