Preparing for 1.9.5 release
Merge branch 'master' into scala_2.9.x_backport

Conflicts:
	project/SalatBuild.scala