More Number fixes for C9's PhantomJS, and first OJ.to tests
Merge
Merge