Merge pull request #2267 from jow-/CVE-2015-8607