first stab
Merge branch 'master' into bindgen-macro
fully switch to bindgen