Merge branch 'meld-fix' of https://github.com/TomOne/chocolateyautomaticpackages-2
Merge branch 'master' of https://github.com/tonigellida/chocolateyautomaticpackages