Merge branch 'master' into openpgp

Conflicts:
	.travis.yml

src/config/preferences.c

@@ -82,7 +82,7 @@ prefs_load(void)
 {
     GError *err;
 
-    log_info("Loading preferences");
+//    log_info("Loading preferences");
     prefs_loc = _get_preferences_file();
 
     if (g_file_test(prefs_loc, G_FILE_TEST_EXISTS)) {
@@ -743,4 +743,4 @@ _get_default_string(preference_t pref)
         default:
             return NULL;
     }
-}
+}

src/config/theme.c

@@ -207,12 +207,15 @@ theme_close(void)
 {
     if (theme) {
         g_key_file_free(theme);
+        theme = NULL;
     }
     if (theme_loc) {
         g_string_free(theme_loc, TRUE);
+        theme_loc = NULL;
     }
     if (bold_items) {
         g_hash_table_destroy(bold_items);
+        bold_items = NULL;
     }
 }
 
@@ -614,4 +617,4 @@ theme_attrs(theme_item_t attrs)
         return result;
 
     }
-}
+}