Merge remote-tracking branch 'upstream/master' into graph-server

assets/src/scripts/components/hydrograph/axes.js

assets/src/scripts/components/hydrograph/cursor.spec.js

assets/src/scripts/components/hydrograph/drawingData.js

assets/src/scripts/components/hydrograph/drawingData.spec.js

assets/src/scripts/components/hydrograph/index.js

assets/src/scripts/components/hydrograph/index.spec.js

assets/src/scripts/components/hydrograph/legend.spec.js

assets/src/scripts/components/hydrograph/parameters.js

assets/src/scripts/components/hydrograph/parameters.spec.js

assets/src/scripts/components/hydrograph/scales.js

assets/src/scripts/components/hydrograph/timeSeries.js

assets/src/scripts/components/hydrograph/timeSeries.spec.js

assets/src/scripts/components/hydrograph/tooltip.spec.js

assets/src/scripts/selectors/timeSeriesSelector.js

assets/src/scripts/selectors/timeSeriesSelector.spec.js

assets/src/scripts/store/index.js

assets/src/scripts/store/index.spec.js