Fix tests
Fix Skiis.takeWhile()
Merge branch 'master' into bizo-2.10

* master:
  Fix Skiis.takeWhile()
  Fix tests
Add Skiis.merge()
Merge branch 'master' into bizo-2.10

* master:
  Add Skiis.merge()