Merge beta changes into master.