Merging master into Elastic Search branch.