Use a path that works on both 32 and 64-bit windows
Merge pull request #247 from mhaskel/work_around_cert_issues

Use the correct path on 32bit windows
Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
Merge pull request #248 from mhaskel/merge_1.1.x

Merge 1.1.x