bleach terms in zamboni (bug 969141)
Merge pull request #1739 from andymckay/969141

bleach terms in zamboni (bug 969141)