ENH: fix std::string usage
Merge branch 'release'

Change-Id: I4fe034418656c6a21e6728a8db9dbc4cef2205fe