merge 5.5 support from fb, fix 5.5+ windows build, add .w32