* upgrade.sh modified for remote installations
Merge remote-tracking branch 'upstream/master'