resync with upstream

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

Merge request reports