Merge branch 'CVE-2013-1977' into dt-test