Merge branch 'master' into testing

diff --combined lib/default.php
index 3f53edf1457e8c7d9d90ad51b70ccf4885a566a6,c969c3b337cc5f7d647a57795e834a6dd88219fa..4f3ea00f2abc11a8bebed8527257e2b0273fa686
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -91,10 -91,13 +91,13 @@@ $default 
                'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
                'debug_memory' => false, // true to spit memory usage to log
                'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue
-               'breakout' => array('*' => 'shared'), // set global or per-handler queue breakout
-                                       // 'shared': use a shared queue for all sites
-                                       // 'handler': share each/this handler over multiple sites
-                                       // 'site': break out for each/this handler on this site
+               'breakout' => array(), // List queue specifiers to break out when using Stomp queue.
+                                      // Default will share all queues for all sites within each group.
+                                      // Specify as <group>/<queue> or <group>/<queue>/<site>,
+                                      // using nickname identifier as site.
+                                      //
+                                      // 'main/distrib' separate "distrib" queue covering all sites
+                                      // 'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite'
                'max_retries' => 10, // drop messages after N failed attempts to process (Stomp)
                'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp)
                ),
@@@ -117,13 -120,11 +120,13 @@@
          'avatar' =>
          array('server' => null,
                'dir' => INSTALLDIR . '/avatar/',
 -              'path' => $_path . '/avatar/'),
 +              'path' => $_path . '/avatar/',
 +              'ssl' => null),
          'background' =>
          array('server' => null,
                'dir' => INSTALLDIR . '/background/',
 -              'path' => $_path . '/background/'),
 +              'path' => $_path . '/background/',
 +              'ssl' => null),
          'public' =>
          array('localonly' => true,
                'blacklist' => array(),
@@@ -131,12 -132,10 +134,12 @@@
          'theme' =>
          array('server' => null,
                'dir' => null,
 -              'path'=> null),
 +              'path'=> null,
 +              'ssl' => null),
          'javascript' =>
          array('server' => null,
 -              'path'=> null),
 +              'path'=> null,
 +              'ssl' => null),
          'throttle' =>
          array('enabled' => false, // whether to throttle edits; false by default
                'count' => 20, // number of allowed messages in timespan
@@@ -194,7 -193,6 +197,7 @@@
          array('server' => null,
                'dir' => INSTALLDIR . '/file/',
                'path' => $_path . '/file/',
 +              'ssl' => null,
                'supported' => array('image/png',
                                     'image/jpeg',
                                     'image/gif',