FIX: appears broken in multisite
Merge branch 'master' of github.com:discourse/discourse