Merge remote-tracking branch 'Sryder13/master'
Render skybox from proper place for cutaway view

(Disclaimer: I don't know C at all)
Merge remote-tracking branch 'RedEnchilada/master'
Will the real 2.1.7 release please stand up?
Merge remote-tracking branch 'upstream/master'