Fixes #8406: Allow content to be filtered by environment.
Merge pull request #4814 from ehelms/fixes-8406

Fixes #8406: Allow content to be filtered by environment.