Sync to the special effects commit in master.