Merge pull request #37 from skybber/master

light-jdk7u60 deopt-cp patch