use https
rename oldText var
Merge branch 'master' into gh-pages