ported content from sinatra repo
dist subtree commit