Merge from Kibana Master