#22 - Backport for ES 0.90.5 and java 1.6