Merge from grafana:Master v1.6.1

merge master branch