Merge remote-tracking branch 'upstream/stable' into merge_stable merged-on-behalf-of: Mathias LANG <pro.mathias.lang@gmail.com>