Merge remote-tracking branch 'origin/develop' into importers-check-file-type-using-signature

packages/rocketchat-lib/client/lib/cachedCollection.js

@@ -98,7 +98,7 @@ class CachedCollection {
 		useSync = true,
 		useCache = true,
 		debug = true,
-		version = 4,
+		version = 5,
 		maxCacheTime = 60*60*24*30
 	}) {
 		this.collection = collection || new Meteor.Collection(null);

packages/rocketchat-oembed/client/oembedUrlWidget.coffee

@@ -36,6 +36,9 @@ Template.oembedUrlWidget.helpers
 
 		url = decodedOgImage or this.meta.twitterImage
 
+		if not url?
+			return
+
 		if url.indexOf('//') is 0
 			url = "#{this.parsedUrl.protocol}#{url}"