Improved Item maker in Setup Wizard. Fixes #1501 and #1601
Merge pull request #1638 from anandpdoshi/hotfix

Improved Item maker in Setup Wizard. Fixes #1501 and #1601