Upstream roll 3#13

adetaylor merged 5 commits intomasteradetaylor/rust-bindgen:masterfrom

upstream-roll-3adetaylor/rust-bindgen:upstream-roll-3Copy head branch name to clipboard