Merge branch 'forms' into gh-pages