Merge fix for periods in env vars from trunk