Merge branch 'master' into max-data-points
Merge branch 'master' into max-data-points
First implementation of maxDataPoints consolidation
Update tests and README
Fix typos
Merge branch 'max-datapoints_pr/3'

Conflicts:
	README.md