Merge "Fix to maintain Java 6 compatability"