Merge pull request #754 from fabro-sh/docs/env-interpolation-cleanup