Some reference version conflict in the Wizard resolved
Authored by: sgrottel 2013-08-25
Parent: [r309]
Child: [r311]