Merge branch 'windows_dll' into HEAD
temp