Merge branch 'PHP-5.6'

Conflicts:
	ext/sqlite3/sqlite3.c

diff --cc ext/sqlite3/sqlite3.c
index eacd66399e0c7286d0730c0e78f25d6350463766,16319a73418bb7a8d481520b14edc826af84e25f..b16cba3668071a9f188c29bf1744fa2aebfb0194
--- 1/ext/sqlite3/sqlite3.c
--- 2/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -299,7 -309,11 +303,11 @@@ PHP_METHOD(sqlite3, lastErrorMsg
                return;
        }
  
-       RETVAL_STRING((char *)sqlite3_errmsg(db_obj->db));
+       if (db_obj->initialised) {
 -              RETURN_STRING((char *)sqlite3_errmsg(db_obj->db), 1);
++              RETURN_STRING((char *)sqlite3_errmsg(db_obj->db));
+       } else {
+               RETURN_EMPTY_STRING();
+       }
  }
  /* }}} */