Minor tweaks to project environment.
Merge branch 'master' into ltxdev