Merge pull request #1269 from Yangqing/dev

Minor change: some namespace simplification