Merge branch 'pr-312' into gh-pages