Issue #1404  Java 6 compatibility fix.
Merge remote-tracking branch 'origin/develop' into develop