Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle
MDL-39061 Cache: (trivial) incorrect MD sublisting
Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle
MDL-38912 fix incorrect timeout reset
MDL-38904 Theme/JavaScript: Tidy up bootstrap JS
MDL-38904 Theme: Correct data-target for navbar
Fix error when awarding a badge from recipients page
MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores
Merge branch 'MDL-38999' of git://github.com/stronk7/moodle
Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle
Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle
Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle
Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle
Merge branch 'MDL-38935' of git://github.com/timhunt/moodle
MDL-39041 Assignment - Fix regression in "allow submission changes".

A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle