This branch has been merged back into 'martin-async' and is now dead.