Upgrade to Scala 2.10.3.
Merge branch 'develop' into topic/scalaz-task

Conflicts:
	build.sbt