Merge branch 'master' into next

Conflicts:
	src/render.c

diff --cc src/render.c
index 3cc5006367eafc021001cfbbed37eda84864e973,2f39b08282e94d9df1fb50f9d88c1c63cf7d20ab..7f92d4d441071601c7871e19b7f57992fec390d9
--- 1/src/render.c
--- 2/src/render.c
+++ b/src/render.c
@@@ -247,8 -255,10 +255,10 @@@ void render_con(Con *con, bool render_f
          render_l_output(con);
      } else if (con->type == CT_ROOT) {
          Con *output;
-         TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
-             render_con(output, false);
+         if (!fullscreen) {
 -            TAILQ_FOREACH (output, &(con->nodes_head), nodes) {
++            TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
+                 render_con(output, false);
+             }
          }
  
          /* We need to render floating windows after rendering all outputs’