Add support for Scala 2.10
Version bump for release of 3.0.2
Merge branch 'release/3.0.2' into develop