add 1.2.9 changes
Merge branch 'master' of github.com:sinatra/sinatra