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

Conflicts:
	boot.php

.htaccess

@@ -37,5 +37,10 @@ AddType audio/ogg .oga
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
+  # If you want to restrict access to your Friendica site to HTTPS only,
+  # uncommment the following lines
+  #RewriteCond %{HTTPS} !=on
+  #RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
+  
 </IfModule>