Merge remote-tracking branch 'origin/master' into test-3

# Conflicts:
#	config.py
#	eos/saveddata/fighter.py

gui/builtinItemStatsViews/itemAttributes.py

@@ -243,6 +243,8 @@ class ItemParams(wx.Panel):
             return "%s (%d)" % (group.name, value) if group is not None else str(value)
 
         def attributeIDCallback():
+            if not value:  # some attributes come through with a value of 0? See #1387
+                return "%d" % (value)
             attribute = Attribute.getInstance().getAttributeInfo(value)
             return "%s (%d)" % (attribute.name.capitalize(), value)