Upgrade to ES 0.90.6