Be more defensive before shlex
Use Archetypes accessor, to ensure we don't get a Unicode string
Merge branch 'master' of git://github.com/davidblewett/Products.PloneFormGen
Record last merge.