fix fallbacks better
Merge git://github.com/cloudfoundry/cf-release