Merge branch 'master' into 1.0
change org and remove winnt and win2k