Merge branch 'master' into preload

* master:
  Remove unused var
  Remove ext/json parser files generated by bison
  Fix run-tests.php for running phpdbg and certain test sections
  Normalize .gitignore

Author: dstogov