Final commit to beta branch.  Please add any new commits to the RC branch.