resync with upstream

Closed Jake Buchholz Göktürk requested to merge github/fork/tomalok/master into master

Created by: tomalok

Merge request reports