Merge remote-tracking branch 'upstream/pull/3365'

diff --combined app/views/diary_entries/show.html.erb
index ccd647d3c6a3114c9ebe93707b2d9b6289a851d2,e281743f6577fb263d53c14875f8d3782736e82d..8792074951ce6efd1d9ca64bec76ede8137162fe
--- 1/app/views/diary_entries/show.html.erb
--- 2/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@@ -1,10 -1,10 +1,10 @@@
  <% content_for :heading do %>
-   <div id="userinformation" class="row">
+   <div class="row">
      <div class="col-sm-auto">
        <%= user_image @entry.user %>
      </div>
      <div class="col">
 -      <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
 +      <h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1>
        <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
      </div>
    </div>