Merge branch 'master' into design/new-data-source+query-editor

client/app/assets/less/redash/redash-newstyle.less

@@ -347,6 +347,10 @@ page-header, .page-header--new {
   }
 }
 
+.filter-container {
+  margin-bottom: 5px;
+}
+
 // Navigation
 .caret--nav {
   border-top: none;

client/app/pages/queries/view.js

@@ -290,6 +290,8 @@ function QueryViewCtrl(
         id: $scope.query.id,
         data_source_id: $scope.query.data_source_id,
         latest_query_data_id: null,
+      }, (updatedQuery) => {
+        $scope.query.version = updatedQuery.version;
       });
     }