Merge remote-tracking branch 'upstream/next' into next

Conflicts:
	tools/encoder/src/TTFFontEncoder.cpp
Merge branch 'next' of https://github.com/zarelaky/GamePlay into next
Merge branch 'next' of https://github.com/zarelaky/GamePlay into next