Merge remote-tracking branch 'origin/master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.13",
+  "version": "5.0.14",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

templates/login.tpl

@@ -2,7 +2,7 @@
 
 <div class="row">
 	<!-- IF allowLocalLogin -->
-	<div class="<!-- IF alternate_logins.length -->col-md-6<!-- ELSE -->col-md-12<!-- ENDIF alternate_logins.length -->">
+	<div class="<!-- IF alternate_logins -->col-md-6<!-- ELSE -->col-md-12<!-- ENDIF alternate_logins -->">
 		<div class="login-block">
 			<div class="alert alert-danger" id="login-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
@@ -49,7 +49,7 @@
 	</div>
 	<!-- ENDIF allowLocalLogin -->
 
-	<!-- IF alternate_logins.length -->
+	<!-- IF alternate_logins -->
 	<div class="<!-- IF allowLocalLogin -->col-md-6<!-- ELSE -->col-md-12<!-- ENDIF allowLocalLogin -->">
 		<div class="alt-login-block">
 			<h4>[[login:alternative_logins]]</h4>
@@ -60,5 +60,5 @@
 			</ul>
 		</div>
 	</div>
-	<!-- ENDIF alternate_logins.length -->
+	<!-- ENDIF alternate_logins -->
 </div>