Merge fix for #448 into gh-pages.