Add latest changes from master.