Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

Conflicts:
	theme/boost/scss/moodle/modules.scss

diff --cc theme/boost/scss/moodle/modules.scss
index b95f91d,a40ed06..7f40642
--- 1/theme/boost/scss/moodle/modules.scss
--- 2/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@@ -237,9 -237,9 +237,12 @@@ div#dock 
  .path-mod-lesson .invisiblefieldset.fieldsetfix {
      display: block;
  }
 +.path-mod-lesson .answeroption .checkbox label p {
 +    display: inline;
 +}
+ #page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
+     white-space: normal;
+ }
  
  .path-mod-wiki .wiki_headingtitle,
  .path-mod-wiki .midpad,

diff --cc theme/bootstrapbase/less/moodle/modules.less
Simple merge

diff --cc theme/bootstrapbase/style/moodle.css
Simple merge