Merge branch 'trunk' into blank-canvas/comments-message

blank-canvas/page.php

@@ -20,6 +20,13 @@ get_header();
 				the_post();
 
 				get_template_part( 'template-parts/content/content-singular' );
+				
+				if ( true === get_theme_mod( 'show_comments', false ) ) :
+					// If comments are open or we have at least one comment, load up the comment template.
+					if ( comments_open() || get_comments_number() ) {
+						comments_template();
+					}
+				endif; 
 
 			endwhile; // End of the loop.
 			?>