Fixes #49 for Windows and Source builds.

It looks like there hasn't been an OSX release yet for 1.8.5.6.
Merge remote-tracking branch 'origin/cve2014-9390'