Merge pull request #636 from solispauwels/activity

Activity
Merge remote-tracking branch 'upstream/3.0-dev' into activity