Merge pull request #1067 from odoo-dev/saas-5-forum-answer-order-fix-htr