Correcting bug introduced that didn't replace env variables.
Merge branch 'master' of https://github.com/henols/arduino-eclipse-plugin