Synchronize with latest elastic4s master as of 10/24/14