fix typo
Merge branch 'api_change' into c++11