Scala 2.11 compatibility (for 7.0.x series)

Backport of #562, with additional Travis checking in place.

Review by @retronym