Updated UPGRADING
Merge pull request #207 from claco/master

Merged automatically by jenkins after successful build test
Merge remote-tracking branch 'upstream/master'