Prevent installer from running multiple times during upgrade
Merge remote branch 'upstream/master'
Merge pull request #1517 from mahagr/master

Prevent installer from running multiple times during upgrade