Merge branches 'master' and 'buffer'