Merging from cloudfoundry trunk