expand environment variables using the env stored on the ActionManager, *not* os.environ.
improve some documentation.
Merge branch 'origin/2.0'