Merged from CloudFoundry master