allow None (bug 950265)
Merge pull request #334 from andymckay/950265

allow None (bug 950265)