Upgrade to scala-2.10.3
Merge branch 'develop' into feature/scheduler