Tooltip should say 1s if scaleSeconds is set. Fix for route change when clicking on auto-refresh submenu
Merge remote branch 'upstream/master'