Bug 570240 - Java 8 compatibility
4 files changed