Allow FORWARDER to be set with -e.
Merge branch 'master' into fedora-20