diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index d13f8bbc36..173424e9be 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -363,6 +363,7 @@ class CommandAddonManager:
             else:
                 from PySide import QtGui
                 self.macros.append(macro)
+                import AddonManager_rc
                 addonicon = QtGui.QIcon(":/icons/" + macro.name.replace(" ","_") + "_macro_icon.svg")
                 if addonicon.isNull():
                     addonicon = QtGui.QIcon(":/icons/applications-python.svg")
diff --git a/src/Mod/AddonManager/InitGui.py b/src/Mod/AddonManager/InitGui.py
index 7f1dd9e70d..60ee0ce51c 100644
--- a/src/Mod/AddonManager/InitGui.py
+++ b/src/Mod/AddonManager/InitGui.py
@@ -4,4 +4,7 @@
 # License LGPL
 
 import AddonManager
+import AddonManager_rc
+
+FreeCADGui.addLanguagePath(":/translations")
 FreeCADGui.addCommand('Std_AddonMgr', AddonManager.CommandAddonManager())
diff --git a/src/Mod/AddonManager/addonmanager_utilities.py b/src/Mod/AddonManager/addonmanager_utilities.py
index df9913a130..fbf3859724 100644
--- a/src/Mod/AddonManager/addonmanager_utilities.py
+++ b/src/Mod/AddonManager/addonmanager_utilities.py
@@ -81,6 +81,8 @@ def urlopen(url):
 
     """Opens an url with urllib2"""
 
+    timeout = 5
+
     if sys.version_info.major < 3:
         import urllib2
     else:
@@ -88,9 +90,9 @@ def urlopen(url):
 
     try:
         if ssl_ctx:
-            u = urllib2.urlopen(url, context=ssl_ctx)
+            u = urllib2.urlopen(url, context=ssl_ctx, timeout=timeout)
         else:
-            u = urllib2.urlopen(url)
+            u = urllib2.urlopen(url, timeout=timeout)
     except:
         return None
     else: