Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/data/templates.php
Simple merge

diff --cc mod/data/view.php
Simple merge

diff --cc mod/forum/post.php
Simple merge