Scala 2.11 compatibility

Review by @gkossakowski