#760 Fixes for JDK 6 build
Merge pull request #764 from carlosmiranda/760

#764: pull request #760 Fixes for JDK 6 build