Help people not put in the wrong URL
Merge branch 'master' into deploy