Re-sync changes from hao
Re-merging changes from Hao
One more sync with Hao's rpivate directory
*** empty log message ***
Merge remote-tracking branch 'github/master'