Merge branch 'master' of https://github.com/elasticsearch/kibana
Merge commit 'a22c608b32694ec0cc93fc725548e42742ff2539'