Merge branch 'stable'

Conflicts:
	test/module/net_sql.common.lua
	test/module/net_sql.common.result
	test/module/net_sql.common.test
	test/module/net_sql.mysql.lua
	test/module/net_sql.mysql.result
	test/module/net_sql.mysql.skipcond
	test/module/net_sql.mysql.test
	test/module/net_sql.pg.lua
	test/module/net_sql.pg.result
	test/module/net_sql.pg.skipcond
	test/module/net_sql.pg.test
	test/test-run.py

test/module/net_sql.mysql.skipcond

@@ -3,7 +3,7 @@ import os.path
 
 try:
     (host, port, user, password, db) = os.getenv('MYSQL').split(':')
-    if not os.path.exists(os.path.join(server.builddir, 'src/module/mysql/mysql.so')):
+    if not os.path.exists(os.path.join(self.args.builddir, 'src/module/mysql/mysql.so')):
         raise RuntimeError('No MySQL module found')
 except (RuntimeError, TypeError, NameError, AttributeError, ValueError):
     self.skip = 1

test/module/net_sql.pg.skipcond

@@ -3,7 +3,7 @@ import os.path
 
 try:
     (host, port, user, password, db) = os.getenv('PG').split(':')
-    if not os.path.exists(os.path.join(server.builddir, 'src/module/pg/pg.so')):
+    if not os.path.exists(os.path.join(self.args.builddir, 'src/module/pg/pg.so')):
         raise RuntimeError('No PG module found')
 except (RuntimeError, TypeError, NameError, AttributeError, ValueError):
     self.skip = 1