Merge "[windows] Use correct macro for exporting symbols" into devel/master