Merge master into next

Alam Ed Ariasrequested to merge
Alam/SRB2:next into next

Try to merge most of master's changes into next, excluding the CMake changes

Merge request reports