new multiple arguments support in upgrade
Merge branch 'origin/master'