Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  . Fixed bug #68120 Update bundled libsqlite

Conflicts:
	ext/sqlite3/libsqlite/sqlite3.c

Author: weltling