MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled
MDL-31824 - Calendar - Fixing HTML classes fopr calendar month view - patch provided by Mark Ward
MDL-36958 Forum: Replaced hard-coded numbers with proper defines
MDL-36212 rework html entity conversions

This should resolve all html entity conversion problems in different PHP versions.
MDL-37191 do not timeout when uninstalling plugins
MDL-37254 add missing AS keyword
MDL-37152 remove bogus $mail->IsSMTP() breaking non-smtp mailing

Credit goes to Aurelijus Bruzas, thanks.
MDL-37281 fix other users current navigation node
MDL-35792 question preview: way to update options without restarting.

It is useful, and possible, to update the display options without
restarting the question. You now only have to restart if you are
changing the maximum mark or the behaviour.
MDL-35794 quiz: config for whether Outcomes are advanced settings
MDL-37068 qformat_learnwise: fix UTF8 and other issues.
MDL-37301 fix missing AS in select

This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.
MDL-37128 fix E_STRICT rss restore issue
MDL-36893 fix mnet E_STRICT issue
Automatically generated installer lang files
MDL-27884 blocks: Correcting config title string

AMOS BEGIN
 CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END

Conflicts:

	blocks/tags/edit_form.php
	blocks/tags/lang/en/block_tags.php
MDL-27884 Implement proper username validation during csv import
MDL-36855 scorm: update to api get_scorm_question_count()

get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used
MDL-36712: Assignment - Do not always send feedback available emails when grade is created

The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".

Conflicts:

	mod/assign/feedback/file/importziplib.php
	mod/assign/feedback/file/locallib.php
	mod/assign/feedback/offline/locallib.php
	mod/assign/locallib.php