Merge branch 'beta-3-bugs' into gh-pages.