Merge branch 'undo' into gh-pages