Sync from upstream three

Merged Diego Ignacio Altamirano Torres requested to merge syncFromUpstreamThree into master

Created by: litneet64

third project sync from upstream repo

Merge request reports