Revert "Merge branch 'master' into Footer"

This reverts commit 78e803c48d6b447e77353b014219fdd479a83e89, reversing
changes made to 2cd2495f69167b07c281388aa3984f24bda4c507.
Revert "Revert "Merge branch 'master' into Footer""

This reverts commit 2694fabdb0eac037cdc1736c65f3542c5b2cc37b.
Revert "Revert "Revert "Merge branch 'master' into Footer"""

This reverts commit b41af63f9dff15e09c85ba568c038c11e2c2aff4.
Revert "Revert "Revert "Revert "Merge branch 'master' into Footer""""

This reverts commit d4bc2c68a944ab31291c20c15f660902e9af39d7.