Merge branch 'design' into gh-pages