Minor merge from cloudfoundry