Updates to scala 2.11.3-SNAPSHOT