Merge pull request #878 from geoffliu/master

[Scala/en] Implicits
Merge remote-tracking branch 'upstream/master'