Sync with Steveice10 repo.