Merge remote-tracking branch 'upstream/develop' into feature/analytics

Conflicts:
	app/views/index/footer.html