Fix for possibility of partial spans
Merge branch 'master' of github.com:elasticsearch/kibana
Merge remote branch 'upstream/master'