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

Conflicts:
	theme/base/style/core.css

diff --cc theme/base/style/core.css
index bedf768,aea5cd0..8816b8e
--- 1/theme/base/style/core.css
--- 2/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@@ -239,18 -239,13 +239,18 @@@ a.skip:active {position: static;display
  .mform fieldset.hidden {border-width:0;}
  .mform fieldset.group {margin-bottom: 0}
  .mform fieldset.error {border: 1px solid #A00;}
- .mform fieldset legend {padding: 0 0.35em;}
 +.mform .collapsible-actions {display: none;}
 +.jsenabled .mform .collapsible-actions {text-align: right; display: block;}
 +.dir-rtl .mform .collapsible-actions {text-align: left;}
  .mform fieldset.collapsible legend a.fheader {padding-left: 18px; background: url([[pix:t/expanded]]) left center no-repeat;}
  .mform fieldset.collapsed legend a.fheader {background-image: url([[pix:t/collapsed]]);}
  .jsenabled .mform fieldset.collapsed {border-width: 1px 0 0 1px; padding: 0; border-color: transparent;}
  .jsenabled .mform fieldset.collapsed div.fcontainer {display: none;}
  .mform .fitem {width:100%;overflow:hidden;margin-top:5px;margin-bottom:1px;clear:right;}
 +.jsenabled .mform .containsadvancedelements .advanced {display: none;}
 +.mform .containsadvancedelements .advanced.show {display: block;}
  .mform .fitem .fitemtitle {width:15%;text-align:right;float:left;}
+ .dir-rtl .mform .fitem .fitemtitle {text-align:left;}
  .mform .fitem .fitemtitle div {display: inline;}
  .mform .fitem .felement {border-width: 0;width:80%;margin-left:16%;}
  .mform .fitem fieldset.felement {margin-left:15%;padding-left:1%;margin-bottom:0}