merged upstream
coffeescript now understands 'yield'