Merge branch 'master' into mam

converse.js

@@ -5858,7 +5858,8 @@
                 } catch (e) {
                     converse.log("Could not restore sessions. Error message: "+e.message);
                 }
-            } else if (this.auto_login) {
+            }
+            if (this.auto_login) {
                 if (!this.jid) {
                     throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
                 }

docs/CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.9.5 (Unreleased)
+------------------
+
+* #439 auto_login and keepalive not working [jcbrand]
+
 0.9.4 (2015-07-04)
 ------------------