merge from base forked

Comment From: pivotal-cla

@jacobzheng Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.