Merge pull request #2369 from ezdiy/c_api_export