Merge pull request #1852 from jbeda/release-v0.4

Set --ip-masq to false