Merge branch 'master' into replacefn

Conflicts:
	dist/Autolinker.js
	dist/Autolinker.min.js
	package.json

Author: gregjacobs

dist/Autolinker.js

@@ -1582,4 +1582,4 @@
 
 	return Autolinker;
 
-} ) );
+} ) );