Merge branch 'gh-pages'
Changes in core for prototype approach and new perf test.