Update beta branch with merges to master.