Merge remote-tracking branch 'upstream/master' into...

Merge remote-tracking branch 'upstream/master' into sprint/FunnyFrog.fix.infinite-scroll-issues-on-notifications-page

# Conflicts:
#	src/app/modules/notifications/notifications.component.ts