These three commits were cherry-picked from master. They were supposed to have been CC'd for stable a while back, but it looks like I forgot to include the CC.
Without these commits, SWR reports back that the highest GL version supported is 2.1, breaking compatibility with various applications, such as VTK/ParaView.