Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle

diff --cc lang/en/admin.php
Simple merge

diff --cc lang/en/deprecated.txt
index 42cf26a,b71c7d5..6733a5c
--- 1/lang/en/deprecated.txt
--- 2/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@@ -35,6 -35,4 +35,7 @@@ downloadtsv,core_tabl
  downloadxhtml,core_table
  invalidpersistent,core_competency
  revealpassword,core_form
 -mobile,core_admin
 +mediasettings,core_media
 +legacyheading,core_media
 +legacyheading_desc,core_media
++mobile,core_admin

diff --cc lib/adminlib.php
Simple merge