Merge fix for #455 into gh-pages.