Fixed warnings and errors for nightly.
option::Item -> option::IntoIter
Merge branch 'master' into callback_buffer