Merge branch 'master' of github.com:sqlmapproject/sqlmap

Conflicts:
	lib/core/testing.py