Merge branch 'master' of https://github.com/Leonardzin/elasticsearch into SecondBranch

Conflicts:
	src/main/java/org/apache/lucene/analysis/CustomAnalyzerWrapper.java