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