Merge pull request #2831 from razzfazz/fix_dllimport