Merge branch 'master' into release/4.0.0

# Conflicts:
#	.travis.yml
#	CHANGELOG.txt
#	can/__init__.py
#	can/bus.py
#	can/interfaces/canalystii.py
#	can/interfaces/ics_neovi/neovi_bus.py
#	can/interfaces/ixxat/canlib.py
#	can/interfaces/socketcan/constants.py
#	can/interfaces/socketcan/socketcan.py
#	can/interfaces/vector/canlib.py
#	can/interfaces/vector/vxlapi.py
#	can/io/asc.py
#	can/io/blf.py
#	can/io/canutils.py
#	can/io/csv.py
#	can/message.py
#	can/player.py
#	doc/development.rst
#	setup.py
#	test/data/logfile.asc
#	test/logformats_test.py
#	test/test_cyclic_socketcan.py
#	test/test_message_class.py

Author: hardbyte