am b6f1a009: Merge "Adjustment to patch for secure processing for CVE-2014-0107 by Ryan Berg based on feedack from Emmanuel Bourg."

* commit 'b6f1a009193f13433cc8b00f27b84733845f3a4d':
  Adjustment to patch for secure processing for CVE-2014-0107 by Ryan Berg based on feedack from Emmanuel Bourg.