Fix for frame buffer exception on exit (at least with OS X). Should be a low-risk change.
Merge pull request #2158 from groundh0g/develop-2155

Fix for frame buffer exception on exit (at least with OS X). Should be a...