Merge branch 'master' of github.com:grafana/grafana

public/app/core/components/sidemenu/sidemenu.ts

@@ -86,8 +86,7 @@ export class SideMenuCtrl {
 
  switchOrg(orgId) {
    this.backendSrv.post('/api/user/using/' + orgId).then(() => {
-     window.location.href = window.location.href;
-     this.$location.path('/');
+     window.location.href = `${config.appSubUrl}/`;
    });
  };
 }