Merge remote-tracking branch 'refs/remotes/origin/master' into zdoom

Conflicts:
	pk3/acs/samsara.o
	pk3/hires/PSTRC0.png
	pk3/sprites/samsara/PSTRC0.png
Merge remote-tracking branch 'refs/remotes/origin/zdoom' into zdoom

Conflicts:
	pk3/acs/samsara.o