Merge pull request #492 from ascott1/universal-landing-page

Universal landing page
Merge remote-tracking branch 'upstream/master' into universal-landing-page