Merge branch 'develop' into roster

sleekxmpp/plugins/xep_0092/version.py

@@ -42,7 +42,7 @@ class xep_0092(base_plugin):
 
         self.xmpp.register_handler(
                 Callback('Software Version',
-                         StanzaPath('iq/software_version'),
+                         StanzaPath('iq@=get/software_version'),
                          self._handle_version))
 
         register_stanza_plugin(Iq, Version)

sleekxmpp/xmlstream/xmlstream.py

@@ -353,8 +353,7 @@ class XMLStream(object):
         self.send_raw(self.stream_footer)
         # Wait for confirmation that the stream was
         # closed in the other direction.
-        if not reconnect:
-            self.auto_reconnect = False
+        self.auto_reconnect = reconnect
         self.stream_end_event.wait(4)
         if not self.auto_reconnect:
             self.stop.set()