Merged from cloudfoundry master