Update for rust changes
Merge branch 'master' into lifetimes