Archived: Fixes overlap calculations on focus
Merge pull request #4151 from berubs/v3.0

Archived: Fixes overlap calculations on focus
Merge branch 'v3.0'