Fixes #895 - Upgrade30.php bugs
Merge pull request #897 from ATofighi/patch-40

Fixes #895 - Upgrade30.php bugs