Merge remote-tracking branch 'github/base-site-2-0-local-john-mamp' into base-site-2-0-local-steve-mamp