Merge beta branch into master.