making sure our redirects post-error go somewhere useful
fixing up the project templates to make sure we can create projects as you'd expect
Merge remote-tracking branch 'upstream/master'