Merge remote-tracking branch 'kraxel/CVE-2011-1751' into staging