#32 - Backport version 1.3.4 to ES 0.90.5