Merge branch 'core' into gh-pages