Merge branch 'warning_fixes'
Merge branch 'windows_dll' (early part)