Changes from master.