Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle

diff --cc blocks/navigation/yui/navigation/navigation.js
index d2631dd,407b5a2..b513e56
--- 1/blocks/navigation/yui/navigation/navigation.js
--- 2/blocks/navigation/yui/navigation/navigation.js
+++ b/blocks/navigation/yui/navigation/navigation.js
@@@ -456,11 -471,9 +473,10 @@@ BRANCH.prototype = 
                          this.addChild(object.children[i]);
                      }
                  }
 -                if ((this.get('type') == NODETYPE.CATEGORY || this.get('type') == NODETYPE.ROOTNODE) && coursecount >= M.block_navigation.courselimit) {
 +                if ((this.get('type') == NODETYPE.CATEGORY || this.get('type') == NODETYPE.ROOTNODE || this.get('type') == NODETYPE.MYCATEGORY)
 +                    && coursecount >= M.block_navigation.courselimit) {
                      this.addViewAllCoursesChild(this);
                  }
-                 this.get('tree').toggleExpansion({target:this.node});
                  return true;
              }
          } catch (ex) {