Update kibana

Trying to merge changes from kibana master