Changes for elasticsearch 1.3.1