Updated to avoid issues with spaces in folder names
Authored by: philsp 2012-06-12
Parent: [r725]
Child: [r727]