minor edits post 2685 - edits end when you do
Australia it Is: post 3782
Merge branch 'win7'