Merge branch 'MDL-66883-master' of git://github.com/bmbrands/moodle

diff --cc mod/forum/templates/discussion_list.mustache
Simple merge

diff --cc mod/forum/templates/inpage_reply_v2.mustache
Simple merge

diff --cc theme/boost/scss/moodle/core.scss
Simple merge

diff --cc theme/boost/style/moodle.css
Simple merge

diff --cc theme/classic/style/moodle.css
Simple merge