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

don't merge, just parking (bug 849892)
Merge pull request #270 from davidbgk/871860-upgrade-funfactory

Bumping funfactory version from 2.1.1 to 2.2.0 (bug 871860)
Manual merge from master