agg updates; include most recent version of master* in repo