Merge branch 'w32'