merged from upstream
Merge remote-tracking branch 'origin/dev' into dev
updated
updated from main stream
Bug fix to activity retrieval logic
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	lib/activityInfo.js