Synced with eavonius github repo for chocolatey 2.0.7 release.