Java 6 compatible.
Merge origin/develop into develop