import changes from downstream project
updates to integrate downstream changes
Merge pull request #1 from osrf/public_backport

Public back port