Changed URL regex
Merge branch 'master' into gh-pages
Changed URL regex
Merge branch 'master' into gh-pages