Fix: indent comments and verbatim envs correctly
#3087
+7
−4
Merged