Merge remote-tracking branch 'origin/master'

Conflicts:
	docnizer/src/main/java/com/bygorillas/docnizer/elasticsearch/base/ElasticSearchBase.java