Merge remote-tracking branch 'upstream/master' into wip-view-flatten

Conflicts:
	project/Build.scala