Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle

diff --cc lib/editor/atto/settings.php
index fbfec13,4eba457..f7d61dc
--- 1/lib/editor/atto/settings.php
--- 2/lib/editor/atto/settings.php
+++ b/lib/editor/atto/settings.php
@@@ -35,7 -35,7 +35,7 @@@ if ($ADMIN->fulltree) 
      $default = 'collapse = collapse
  style1 = title, bold, italic
  list = unorderedlist, orderedlist
- links = link, noautolink
 -links = link, unlink
++links = link
  files = image, media, managefiles
  style2 = underline, strike, subscript, superscript
  align = align