Merge branch 'nobangs' into blead