Merge branch 'master' into chart-labels