work in progress
Merge branch 'master' of github.com:0xdata/h2o
work in progres
Merge branch 'master' of github.com:0xdata/h2o
Merge branch 'master' of github.com:0xdata/h2o

Conflicts:
	py/testdir_single_jvm/b.py
	py/testdir_single_jvm/test_summary2_uniform.py