Update to scala 2.11 (rc)
Merge remote-tracking branch 'origin/master'