Merge branch 'MDL-47127-master' of git://github.com/ankitagarwal/moodle
MDL-44447 grade_export: Added multiple grade display types to grade export.
Merge branch 'MDL-44447-master' of git://github.com/lameze/moodle
MDL-44447 Grade: Whitespace fix
MDL-44447 Grade: Re-order lang strings
MDL-47242 theme_bootstrapbase: fix nested custom_menu responsive display
MDL-47244 theme_bootstrapbase: fix custom_menu dividers under responsive layouts
Merge branch 'MDL-47206-master' of git://github.com/andrewnicols/moodle
Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-46810' of git://github.com/timhunt/moodle
Merge branch 'MDL-46331' of git://github.com/timhunt/moodle
Merge branch 'wip-MDL-46585-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-46195' of git://github.com/timhunt/moodle
MDL-47248 Use new Moodle logo for RSS feeds generated by Moodle

Themes can override this logo as any other core pix file. The new logo copied
from https://moodle.org/logo/ and resized to match the previous logo size
(140x35px).
Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle
MDL-47079 user: behat test for deleting users
MDL-44257 message: added test to make sure the stored file still exists
MDL-44257 lib: fix the attachment code to accept tempdir and dataroot.

Credit goes to Damyon, thanks.
MDL-40356 lib: Unit tests for the alternativefullnameformat setting.
MDL-40356 lib: New setting to display full names.

This adds a new setting to display more name information for users
with the viewfullnames capability.