Update for scala 2.11.2
Merge branch 'paweld2-master'
Update for scala 2.11.2