Java 7 compatibility
Upgrading internal release plugin