Merge branch 'master' into next

diff --cc i3bar/src/config.c
index 1f0c2a8eb2b3ec2439d3e65f8548a0ce7fa6de71,809b1ab4cfbec09840f919f3ae0bf42ab2e1efac..6f1a8b8e8cc387732b73cd504e65fc9ebadc77d5
--- 1/i3bar/src/config.c
--- 2/i3bar/src/config.c
+++ b/i3bar/src/config.c
@@@ -246,10 -246,9 +246,9 @@@ void parse_config_json(char *json) 
   *
   */
  void free_colors(struct xcb_color_strings_t *colors) {
--#define FREE_COLOR(x)        \
--    do {                     \
-         if (colors->x)       \
-             free(colors->x); \
 -        FREE(colors->x);     \
++#define FREE_COLOR(x)    \
++    do {                 \
++        FREE(colors->x); \
      } while (0)
      FREE_COLOR(bar_fg);
      FREE_COLOR(bar_bg);