Merge remote-tracking branch 'upstream/stable' into merge_stable merged-on-behalf-of: Martin Nowak <code@dawg.eu>