merge upstream

Merged Philip Müller requested to merge oberon-manjaro:master into master

Created by: philmmanjaro

Merge request reports