improve upgrade readme
Merge branch 'master' into wamp2