Merge develop into 20171122_-_port_tagcloud

Conflicts:
	include/features.php

diff --cc include/features.php
index 340394e,ade93a1..f199357
--- 1/include/features.php
--- 2/include/features.php
+++ b/include/features.php
@@@ -113,8 -113,7 +113,8 @@@ function get_features($filtered = true
                // Advanced Profile Settings
                'advanced_profile' => array(
                        t('Advanced Profile Settings'),
-                       array('forumlist_profile', t('List Forums'),                    t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile')),
+                       array('forumlist_profile', t('List Forums'),                    t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile', false)),
 +                      array('tagadelic',      t('Tag Cloud'),                         t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic')),
                ),
        );