Merge pull request #918 from annando/buffer-unsupported