release 3.6.1

Conflicts:
	project/Build.scala