Make return from "stat" in Java 6 compatible with Java 7.
Merge branch 'master' into greg-java6-3