Cherry picked tmhedbergs pull request from lokaltog's develop branch.

Also removed 2 lines included from a prior commit that prevented double
backtick '``' from working properly (double backtick would go to the
beginning of the line instead of the appropriate column).