Ticket #786 - Extra <div id=wrap> tag should be removed