fixes
Added aggregation cursor and tests
Merge branch 'master' into 2.0-dev