rebase against master

public/app/features/templating/partials/editor.html

@@ -109,10 +109,16 @@
 					<span class="gf-form-label" ng-show="current.auto">
 						Auto interval steps <tip>How many times should the current time range be divided to calculate the value</tip>
 					</span>
-					<div class="gf-form-select-wrapper max-width-10">
+					<div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
 						<select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
 					</div>
 				</div>
+				<div class="gf-form">
+					<span class="gf-form-label" ng-show="current.auto">
+						Auto interval min value <tip>The calculated value will not go below this threshold</tip>
+					</span>
+					<input type="text" class="gf-form-input max-width-10" ng-show="current.auto" ng-model="current.auto_min" ng-change="runQuery()"></input>
+				</div>
 			</div>
 
 			<div ng-show="current.type === 'custom'" class="gf-form-group">

public/app/features/templating/templateValuesSrv.js

@@ -60,7 +60,7 @@ function (angular, _, kbn) {
         variable.options.unshift({ text: 'auto', value: '$__auto_interval' });
       }
 
-      var interval = kbn.calculateInterval(timeSrv.timeRange(), variable.auto_count);
+      var interval = kbn.calculateInterval(timeSrv.timeRange(), variable.auto_count, (variable.auto_min ? ">"+variable.auto_min : null));
       templateSrv.setGrafanaVariable('$__auto_interval', interval);
     };