Track Rust master
Merge remote-tracking branch 'origin/master' into build-cmd

Conflicts:
	src/ffi/version.rs