altered to handle auto added double quotes.
Authored by: philsp 2014-09-19
Parent: [r3422]
Child: [r3424]