am 3bbb6494: am 772e12cf: Cumulative security CVE-2014-3686 patch

* commit '3bbb64943b5c815d6b22b56f3255d6651294adbe':
  Cumulative security CVE-2014-3686 patch