add upgrade message
Merge branch 'master' into upgrade