add in CSP (bug 849892)
Merge pull request #258 from andymckay/849892

don't merge, just parking (bug 849892)