Merge "Add test for CVE-2014-3153" into jb-dev