Merge branch 'master' into bug/fieldnames-with-dots-in-elasticsearch