set the test browser to PhantomJS
Merge remote-tracking branch 'origin/master'