Merge remote-tracking branch 'upstream/master'
OpenGL: FOF cutting fix

Fixes any FOF's with FF_SOLID not cutting each other.
Merge remote-tracking branch 'upstream/master'
OpenGL: FOF Cutting Fix 2

Fixes Translucent FOF's cutting Solid FOF's.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'Sryder13/master'
Merge branch 'master' into next