Enforce JDK7, close #923