Merging from cloudfoundry trunk

Merge from cloudfoundry trunk