Merge branch 'master' into 'master'

Fixed an alignment issue, fixes #778

This merge request fixes issue #778. I have figured out the problem already here: https://gitlab.com/gitlab-org/gitlab-ce/issues/778#note_366548

See merge request !242

app/assets/stylesheets/generic/highlight.scss

@@ -59,6 +59,10 @@
     pre {
       white-space: pre;
       word-wrap: normal;
+
+      code {
+        font-family: $monospace_font;
+      }
     }
   }
 }