Merge pull request #1811 from rubenk/backport-cve-2016-6254-to-4.10