Time to merge the user-activity branch with the master ... please?

:beers: