The single merge to the backport branch that didn't cause a slew of code conflicts silently changed the Scala build version.  Gah.  Resetting to 2.9.3.