Updated DPSetupWindow
Merge pull request #8665 from danpalmer/master

Updated DPSetupWindow