Merge branch 'upstream/saas-5' into saas-5

diff --cc addons/website_forum/views/website_forum.xml
index a38c1a0,25bf71c..f7191e1
--- 1/addons/website_forum/views/website_forum.xml
--- 2/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@@ -180,8 -180,13 +180,13 @@@
                      t-field="question.create_uid" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                      style="display: inline-block;"/>
                  on <span t-field="question.write_date" t-field-options='{"format":"short"}'/>
+                 <span class="visible-xs">
+                     <b t-esc="question.child_count or 0"/>
+                     <t t-if="question.child_count&gt;1">answers</t>
+                     <t t-if="question.child_count==1">answers</t>
+                 </span>
                  with <b t-field="question.views"/> views
 -                <span t-if="question.vote_count&gt;0"> and 
 +                <span t-if="question.vote_count&gt;0"> and
                      <b t-esc="question.vote_count or 0"/>
                      <t t-if="question.vote_count&gt;1">votes</t>
                      <t t-if="question.vote_count==1">vote</t>