bugfixes
Merge branch 'master' of github.com:immateriel/phantomjs