Updated a link on the 404 page
Merge branch 'beta'