fixed dist_env mode: dist-flag was not correctly propagated
Merge branch 'master' of https://github.com/fschlimb/icnc