Merge branch 'about-link' into deployment