Bugfixes
Schow label if no logo is present
Merge remote-tracking branch 'upstream/master'
Bugfixes
Bugfixes
Merge remote-tracking branch 'upstream/master'