New per-site setting to remember to set when setting up a new site.
Merge remote-tracking branch 'upstream/merge1' into merge1
Merge pull request #317 from knowledgepoint-devs/merge1

New per-site setting to remember to set when setting up a new site.