Prepare for 1.9.7 release
Merge remote-tracking branch 'origin/master' into scala_2.9.x_backport

Conflicts:
	project/SalatBuild.scala