Sync from upstream two

Merged Diego Ignacio Altamirano Torres requested to merge syncFromUpstreamTwo into master

Created by: litneet64

sync from current upstream

Merge request reports