Updated changes from master.