Merge from elasticsearch master (2013/10/31)

Merge from elasticsearch master (2013/10/31)