Merge remote-tracking branch 'upstream/master'
bump deps to help Windows users.

helps w/ #446
Merge remote-tracking branch 'upstream/master'
Merged upstream changes