this makes more sense
Merge branch 'nospam' into testing