Merging with master, continued.