Copied two units from experimental branch and added to project.
Authored by: delphidabbler 2013-09-14
Parent: [r3497]
Child: [r3499]