Merge branch 'master' into 3.6

for master updates

Conflicts:
	lo.js
	twittperator.js

1 files changed, 1 insertions, 1 deletions

diff --git a/prevent-pseudo-domain.js b/prevent-pseudo-domain.js
index 7981874..0e4124c 100644
--- a/prevent-pseudo-domain.js
+++ b/prevent-pseudo-domain.js
@@ -5,7 +5,7 @@
     }
 
     function isWord (s) {
-        return /^[^\s\.]+$/i.test(s);
+        return /^[^\s\.\/]+$/i.test(s);
     }
 
     function isIPAddress (s) {