fix for --enable-complex
Merge branch 'master' into exodus_refresh