Eliminate warnings uncovered by Scala 2.10.
Merge branch '2.2.x' into develop