1.4: Sync with master repo.