Helps to keep your cache keys site-specific.
Merge branch 'master' into i18n