SRB2_assets_222: Merge branch '2.2.2-prep' into 'next'

2.2.2 preparation

See merge request STJr/SRB2!811

SRB2 v2.2.1 assets

SRB2_assets_221

Merge branch 'master' into public_next