Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo

Bar and combo support for time scale