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

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

theme/boost/scss/moodle/modules.scss

@@ -240,6 +240,9 @@ div#dock {
 .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,

theme/bootstrapbase/less/moodle/modules.less

@@ -411,6 +411,9 @@ div#dock {
 #page-mod-lesson-view .password-form .submitbutton {
     display: inline;
 }
+#page-mod-lesson-view .branchbuttoncontainer .singlebutton input[type="submit"] {
+    white-space: normal;
+}
 .path-mod-lesson .reviewessay {
     width: 40%;
     border: 1px solid #ddd;