Merge from cloudfoundry