Merge remote-tracking branch 'upstream/master' into fix/giddy-giraffe-analytics

# Conflicts:
#	src/app/modules/analytics/components/charts/comments/comments.component.ts
#	src/app/modules/analytics/components/charts/plus/offchain-plus.component.ts
#	src/app/modules/analytics/components/charts/plus/onchain-plus.component.ts
#	src/app/modules/analytics/components/charts/rewards/rewards.component.ts
#	src/app/modules/analytics/components/charts/token-sales/sales.component.ts
#	src/app/modules/analytics/components/charts/user-segments/segments.component.ts
#	src/app/modules/analytics/components/charts/votes/votes.component.ts
#	src/app/modules/analytics/components/charts/wire/offchain-wire.component.ts
#	src/app/modules/analytics/components/charts/wire/onchain-wire.component.ts
#	src/app/modules/analytics/components/charts/withdraw/withdraw.component.ts