Update to rust master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libgit2-sys/lib.rs