Merge branch 'async-unbuffer' into master