Updated to latest Grafana