Merge pull request #729 from danvk/chart-overlaps