Cherry-pick bmizerany/sinatra@b14293f147e26ed8aecb52129a63764b1bb7e7f3
mention pass blocks in CHANGES [ci skip]

Conflicts:
	CHANGES