Merge branch 'footer-update'
Merge branch 'master' into footer-update