am 0bf0d41f: am 4fff398d: am 912d1506: am 8ba31cff: am 95c75537: Merge "Add test for CVE-2014-3153" into jb-dev

* commit '0bf0d41f85390d4a6ed31637c257920a932f15b8':
  Add test for CVE-2014-3153