Merge pull request #2354 from xmcclure/ugh-no-gdi