Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.travis.yml
#	Makefile
#	docs/conf.py
#	docs/index.rst
#	docs/library/guide.rst
#	docs/user/advanced.rst
#	docs/user/basicusage.rst
#	requirements.txt
#	setup.py
#	src/wfencode.py
#	src/wfpayload.py
#	src/wfuzz-cli.py
#	src/wfuzz/__init__.py
#	src/wfuzz/api.py
#	src/wfuzz/core.py
#	src/wfuzz/exception.py
#	src/wfuzz/externals/moduleman/loader.py
#	src/wfuzz/externals/moduleman/modulefilter.py
#	src/wfuzz/externals/moduleman/plugin.py
#	src/wfuzz/externals/moduleman/registrant.py
#	src/wfuzz/externals/reqresp/Request.py
#	src/wfuzz/externals/reqresp/Response.py
#	src/wfuzz/externals/reqresp/TextParser.py
#	src/wfuzz/externals/reqresp/Variables.py
#	src/wfuzz/externals/reqresp/cache.py
#	src/wfuzz/externals/reqresp/exceptions.py
#	src/wfuzz/externals/settings/settings.py
#	src/wfuzz/facade.py
#	src/wfuzz/fuzzobjects.py
#	src/wfuzz/fuzzqueues.py
#	src/wfuzz/mixins.py
#	src/wfuzz/myhttp.py
#	src/wfuzz/myqueues.py
#	src/wfuzz/options.py
#	src/wfuzz/plugin_api/base.py
#	src/wfuzz/plugin_api/payloadtools.py
#	src/wfuzz/plugin_api/urlutils.py
#	src/wfuzz/plugins/encoders/encoders.py
#	src/wfuzz/plugins/iterators/iterations.py
#	src/wfuzz/plugins/payloads/autorize.py
#	src/wfuzz/plugins/payloads/bing.py
#	src/wfuzz/plugins/payloads/buffer_overflow.py
#	src/wfuzz/plugins/payloads/burpitem.py
#	src/wfuzz/plugins/payloads/burplog.py
#	src/wfuzz/plugins/payloads/burpstate.py
#	src/wfuzz/plugins/payloads/dirwalk.py
#	src/wfuzz/plugins/payloads/file.py
#	src/wfuzz/plugins/payloads/guitab.py
#	src/wfuzz/plugins/payloads/hexrand.py
#	src/wfuzz/plugins/payloads/hexrange.py
#	src/wfuzz/plugins/payloads/ipnet.py
#	src/wfuzz/plugins/payloads/iprange.py
#	src/wfuzz/plugins/payloads/list.py
#	src/wfuzz/plugins/payloads/names.py
#	src/wfuzz/plugins/payloads/permutation.py
#	src/wfuzz/plugins/payloads/range.py
#	src/wfuzz/plugins/payloads/shodanp.py
#	src/wfuzz/plugins/payloads/stdin.py
#	src/wfuzz/plugins/payloads/wfuzzp.py
#	src/wfuzz/plugins/printers/printers.py
#	src/wfuzz/plugins/scripts/backups.py
#	src/wfuzz/plugins/scripts/cookies.py
#	src/wfuzz/plugins/scripts/cvs_extractor.py
#	src/wfuzz/plugins/scripts/errors.py
#	src/wfuzz/plugins/scripts/grep.py
#	src/wfuzz/plugins/scripts/headers.py
#	src/wfuzz/plugins/scripts/links.py
#	src/wfuzz/plugins/scripts/listing.py
#	src/wfuzz/plugins/scripts/robots.py
#	src/wfuzz/plugins/scripts/screenshot.py
#	src/wfuzz/plugins/scripts/sitemap.py
#	src/wfuzz/plugins/scripts/svn_extractor.py
#	src/wfuzz/plugins/scripts/title.py
#	src/wfuzz/plugins/scripts/wcdb.py
#	src/wfuzz/ui/console/clparser.py
#	src/wfuzz/ui/console/common.py
#	src/wfuzz/ui/console/getch.py
#	src/wfuzz/ui/console/mvc.py
#	src/wfuzz/ui/console/output.py
#	src/wfuzz/ui/gui/controller.py
#	src/wfuzz/ui/gui/guicontrols.py
#	src/wfuzz/ui/gui/model.py
#	src/wfuzz/wfuzz.py
#	src/wxfuzz.py
#	tests/server_dir/simple_server.py
#	tests/test_acceptance.py
#	tests/test_api.py
#	tests/test_clparser.py
#	tests/test_filterintro.py
#	tests/test_moduleman.py
#	tests/test_req_parse.py
#	tests/test_reqresp.py
#	tox.ini
