sync

Sync with Hott:master