Fix calendar (home-assistant#6691)

Merge pull request home-assistant#6662 from home-assistant/dev

Merge pull request home-assistant#6596 from home-assistant/202008110

Merge to master for 20200807.1 (home-assistant#6566)

* Reorder to not break jinja templates (home-assistant#6564)

* Bumped version to 20200807.1

Merge pull request home-assistant#6562 from home-assistant/dev

Merge dev to master for 20200807.0

Merge pull request home-assistant#6524 from home-assistant/dev

20200805.0

Merge pull request home-assistant#6510 from home-assistant/dev

Merge pull request home-assistant#6411 from home-assistant/dev

Merge pull request home-assistant#6399 from home-assistant/dev

Merge pull request home-assistant#6396 from home-assistant/dev