Use default phantomjs
Merge branch 'master' into 134