2.1 and 2.1-JS
Merge branch 'master' of https://github.com/lihaoyi/scala.rx