Sync from upstream

Merged Diego Ignacio Altamirano Torres requested to merge syncFromUpstream into master

Created by: litneet64

Merge request reports