Sync -x
Merge pull request #313 from pandamicro/master

Sync -x