Merge remote-tracking branch 'upstream/master' into add_docs

author Richard Dodd <richard.dodd@itp-group.co.uk>

Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)

committer Richard Dodd <richard.dodd@itp-group.co.uk>

Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
author Richard Dodd <richard.dodd@itp-group.co.uk>
Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
committer Richard Dodd <richard.dodd@itp-group.co.uk>
Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
diff --cc Cargo.lock
Simple merge
diff --cc src/cargo/core/package.rs
Simple merge
author	Richard Dodd <richard.dodd@itp-group.co.uk>
	Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
committer	Richard Dodd <richard.dodd@itp-group.co.uk>
	Mon, 2 Oct 2017 12:37:40 +0000 (13:37 +0100)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
src/cargo/core/package.rs	patch \|	diff1 \|	diff2 \|	blob \| history