I addressed this compatibility issue in

https://github.com/Netflix/feign/pull/90

@adriancole Should we just cherry pick that into master?