fix #32
v1.2.2
Merge branch 'v1.2.2'

Conflicts:
	project/ActivateBuild.scala