OpenGL2: Better BSP surface merging.
Merge remote-tracking branch 'ioquake3/master'