diff --git a/boot.php b/boot.php
index 43f69fc115..a70c7bf616 100644
--- a/boot.php
+++ b/boot.php
@@ -1558,7 +1558,7 @@ function killme() {
  * @brief Redirect to another URL and terminate this process.
  */
 function goaway($s) {
-	if (!strstr(normalise_link($s), normalise_link(App::get_baseurl())))
+	if (!strstr(normalise_link($s), "http://"))
 		$s = App::get_baseurl()."/".$s;
 
 	header("Location: $s");
diff --git a/doc/htconfig.md b/doc/htconfig.md
index f9c92bfa08..a36e0bef22 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -64,9 +64,6 @@ line to your .htconfig.php:
 * throttle_limit_week - Maximum number of posts that a user can send per week with the API.
 * throttle_limit_month - Maximum number of posts that a user can send per month with the API.
 * wall-to-wall_share (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
-* worker (Boolean) - (Experimental) Use the worker system instead of calling several background processes. Reduces the overall load and speeds up item delivery.
-* worker_dont_fork (Boolean) - if enabled, the workers are only called from the poller process. Useful on systems that permit the use of "proc_open".
-* worker_queues - Number of parallel workers. Default value is 10 queues.
 * xrd_timeout - Timeout for fetching the XRD links. Default value is 20 seconds.
 
 ## service_class ##
diff --git a/include/cron.php b/include/cron.php
index d68bd7f084..db7d44be0b 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -357,7 +357,7 @@ function cron_clear_cache(&$a) {
 			continue;
 
 		// Calculate fragmentation
-		$fragmentation = $table["Data_free"] / $table["Data_length"];
+		$fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]);
 
 		logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG);
 
diff --git a/mod/admin.php b/mod/admin.php
index e7c4f51b66..28c8ed15c2 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -619,6 +619,9 @@ function admin_page_site_post(&$a) {
 	$only_tag_search	=	((x($_POST,'only_tag_search'))		? True						: False);
 	$rino			=	((x($_POST,'rino'))			? intval($_POST['rino'])			: 0);
 	$embedly		=	((x($_POST,'embedly'))			? notags(trim($_POST['embedly']))		: '');
+	$worker			=	((x($_POST,'worker'))			? True						: False);
+	$worker_queues		=	((x($_POST,'worker_queues'))		? intval($_POST['worker_queues'])		: 4);
+	$worker_dont_fork	=	((x($_POST,'worker_dont_fork'))		? True						: False);
 
 	if($a->get_path() != "")
 		$diaspora_enabled = false;
@@ -765,7 +768,9 @@ function admin_page_site_post(&$a) {
 	set_config('system','proxy_disabled', $proxy_disabled);
 	set_config('system','old_pager', $old_pager);
 	set_config('system','only_tag_search', $only_tag_search);
-
+	set_config('system','worker', $worker);
+	set_config('system','worker_queues', $worker_queues);
+	set_config('system','worker_dont_fork', $worker_dont_fork);
 
 	if($rino==2 and !function_exists('mcrypt_create_iv')) {
 		notice(t("RINO2 needs mcrypt php extension to work."));
@@ -904,6 +909,7 @@ function admin_page_site(&$a) {
 		'$advanced' => t('Advanced'),
 		'$portable_contacts' => t('Auto Discovered Contact Directory'),
 		'$performance' => t('Performance'),
+		'$worker_title' => t('Worker'),
 		'$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
 		'$baseurl' => $a->get_baseurl(true),
 		// name, label, value, help string, extra data...
@@ -992,6 +998,10 @@ function admin_page_site(&$a) {
 		'$rino' 		=> array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
 		'$embedly' 		=> array('embedly', t("Embedly API key"), get_config('system','embedly'), t("<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter.")),
 
+		'$worker'		=> array('worker', t("Enable 'worker' background processing"), get_config('system','worker'), t("The worker background processing limits the number of parallel background jobs to a maximum number and respects the system load.")),
+		'$worker_queues' 	=> array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
+		'$worker_dont_fork'	=> array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
+
 		'$form_security_token'	=> get_form_security_token("admin_site")
 
 	));
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 91957d016a..f22319b695 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -154,6 +154,12 @@
 	{{include file="field_checkbox.tpl" field=$old_pager}}
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
+	<h3>{{$worker_title}}</h3>
+	{{include file="field_checkbox.tpl" field=$worker}}
+	{{include file="field_input.tpl" field=$worker_queues}}
+	{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+
 	</form>
 	
 	{{* separate form for relocate... *}}