Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages
Changed the welcome page text