Merge pull request #2194 from martinlindhe/master

author Oliver Schneider <oli-obk@users.noreply.github.com>

Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)

committer GitHub <noreply@github.com>

Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)
author Oliver Schneider <oli-obk@users.noreply.github.com>
Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)
committer GitHub <noreply@github.com>
Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc src/driver.rs
Simple merge
author	Oliver Schneider <oli-obk@users.noreply.github.com>
	Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)
committer	GitHub <noreply@github.com>
	Thu, 2 Nov 2017 09:30:10 +0000 (10:30 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/driver.rs	patch \|	diff1 \|	diff2 \|	blob \| history