Another tweak to the spanAffectsWrapping regexp
Merge remote-tracking branch 'stream/master'
Merge branch 'master' into webed