Recorded changes imported from portable branch at r2638.
Authored by: delphidabbler 2013-01-05
Parent: [r2638]
Child: [r2640]